[winlogbeat] Only init metrics if needed#40703
Merged
marc-gr merged 1 commit intoelastic:mainfrom Sep 6, 2024
Merged
Conversation
botelastic
bot
added
the
needs_team
marc-gr
added
backport-skip
Contributor
|
Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform) |
botelastic
bot
removed
the
needs_team
nfritts
approved these changes
Sep 6, 2024
intxgo
reviewed
Sep 6, 2024
| l.metrics = newInputMetrics(l.channelName, l.id) | ||
| if l.metrics == nil { | ||
| l.metrics = newInputMetrics(l.channelName, l.id) | ||
| } |
Contributor
There was a problem hiding this comment.
does it mean that l.Open is called twice without l.Close? If so, there seems to be more issues
https://learn.microsoft.com/en-us/windows/win32/api/winevt/nf-winevt-evtsubscribe#return-value
so perhaps
-return l.openChannel(bookmark)
+ if l.subscription {
+ win.Close(l.subscription)
+}
+return l.openChannel(bookmark)
Contributor
Author
There was a problem hiding this comment.
It only gets called more than once in case it fails to open, so no need to call close in that case.
intxgo
approved these changes
Sep 6, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed commit message
Add check on winlog metrics to prevent panic.
Metrics initialization was deferred to avoid registering them on
CheckConfigcalls. Now that is insideOpenwe need to check to avoid panicking when retrying on recoverable errors.Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.No changelog entry since the change that introduced this is still not released.